Rework handling of panning to identified features by uclaros · Pull Request #4591 · MerginMaps/mobile

uclaros · 2026-07-10T12:02:14Z

Plan A

This PR is a rework on how we jump to geometries. It was initially just a way to mitigate a GEOS crash when identifying self-overlapping multipart geometries, but quickly evolved!

Plan B

If this is too much for a last minute change, we can avoid hitting the geos bug by slightly modifying the current approach: Perform bounding box intersections instead of geometry intersections.

diff --git a/app/inpututils.cpp b/app/inpututils.cpp
index b5573eb3..02a874e8 100644
--- a/app/inpututils.cpp
+++ b/app/inpututils.cpp
@@ -330,13 +330,12 @@ QPointF InputUtils::relevantGeometryCenterToScreenCoordinates( const QgsGeometry
 
   const QgsRectangle currentExtent = mapSettings->mapSettings().visibleExtent();
 
-  // Cut the geometry to current extent
-  const QgsGeometry currentExtentAsGeom = QgsGeometry::fromRect( currentExtent );
-  const QgsGeometry intersectedGeom = geom.intersection( currentExtentAsGeom );
+  // Cut the geometry extent to current extent
+  const QgsRectangle intersectedExtent = currentExtent.intersect( geom.boundingBox() );
 
-  if ( !intersectedGeom.isEmpty() )
+  if ( !intersectedExtent.isEmpty() )
   {
-    target = QgsPoint( intersectedGeom.boundingBox().center() );
+    target = QgsPoint( intersectedExtent.center() );
   }
   else
   {

This will change the existing behavior, eg identifying C shaped geometry that is partially visible will not recenter the map canvas to the center of the visible part of the geometry, but to the visible part of the geom bbox.

Testing notes:

need to test all Geometries that we support (Points, Lines, Polygons and it's multi variants)

We will use it to jump to the highlighted feature once we know the available area of the map that is not covered by the panel

- Use the renamed previewPanelHeight property instead of signal params

- Move all highlighting and form opening to a identifyFeature()

- Don't pan if whole feature is near visible map center - Center feature to visible map if it fits - Center clicked location to visible map if whole does not fit

- Add method to calculate the map extent required for a geometry to fit the visible part of the map canvas when covered by a drawer - Use animated zoom when identifying features from a list and not on map

Withalion · 2026-07-15T13:27:08Z

might help resolve #3845 as well

Withalion

Nice! It would be great to rebase on current master as well since some time passed.

Withalion · 2026-08-17T09:25:02Z

+  // Holds the map coordinates of the point the user identified. NaN if identify was triggered from list of features
+  property point identifyLocation: Qt.point(NaN, NaN)
+
+  signal featureIdentified( var pair, var point )


Suggested change

signal featureIdentified( var pair, var point )

signal featureIdentified( FeatureLayerPair pair, qgsPoint clickedPoint )

It's about time we expose FeatureLayerPair & QgsPoint to QML properly

Well yes, but do you think this PR is the proper place to do it?

Withalion · 2026-08-17T10:39:44Z

  }
 }

+void TestUtilsFunctions::testWhereToPanWhenIdentifying()


Could we check here that the scale has not changed as well

InputUtils::whereToPanWhenIdentifying() does not perform the panning, it only finds out the point that needs to be panned to.
It does not modify the settings at all.
Maybe better const' the InputMapSettings *` param to clarify the intent?

Withalion · 2026-08-17T10:44:49Z

+  }
+}
+
+void TestUtilsFunctions::testDrawerCompensatedExtent()


As well here I would have case for:

when the map is just panned

when feature is bigger then current extent, so the map zooms out

when feature is smaller then current extent

This only tests the extent calculation when compensating for the drawer height.

Testing the actual panning to and zooming to would be a completely different case.

Withalion · 2026-08-27T11:18:27Z

@uclaros can you please imrpove the description of this issue. What's happening, what's the issue. Mostly for testers to understand the issue better.

github-actions · 2026-08-27T16:43:54Z

📦 Build Artifacts Ready

OS	Status	Build	Info	Workflow run
macOS Build	📬	Mergin Maps 72391 dmg	Expires: 25/11/2026	#7239
linux Build	❌	Build failed or not found.		#7265
win64 Build	📬	Mergin Maps 64411 win64	Expires: 25/11/2026	#6441
Android Build	📬	Mergin Maps 854911 APK [armeabi-v7a]	Expires: 25/11/2026	#8549
	📬	Mergin Maps 854911 APK [armeabi-v7a]	Google Play Store	#8549
Android Build	📬	Mergin Maps 854951 APK [arm64-v8a]	Expires: 25/11/2026	#8549
	📬	Mergin Maps 854951 APK [arm64-v8a]	Google Play Store	#8549
iOS Build	📬		Build number: 26.08.949111	#9491

uclaros added 7 commits July 10, 2026 11:44

Fire a signal when the preview panel height has settled.

3321e9f

We will use it to jump to the highlighted feature once we know the available area of the map that is not covered by the panel

- Use the new doneLoading() signal

436777a

- Use the renamed previewPanelHeight property instead of signal params

- Store identify click point map coords

a63de42

- Move all highlighting and form opening to a identifyFeature()

Update canvas panning logic when identifying:

c5e5d4f

- Don't pan if whole feature is near visible map center - Center feature to visible map if it fits - Center clicked location to visible map if whole does not fit

Fix handling of empty but not null geometries

c9b8b3d

- Add animated zoom to map extent

516683f

- Add method to calculate the map extent required for a geometry to fit the visible part of the map canvas when covered by a drawer - Use animated zoom when identifying features from a list and not on map

Fix test macro

4f45e09

uclaros mentioned this pull request Jul 13, 2026

Use bounding box intersections to avoid geos bug #4595

Merged

Withalion added this to the 2026.4.0 milestone Jul 13, 2026

Withalion assigned uclaros Jul 13, 2026

Withalion reviewed Aug 17, 2026

View reviewed changes

Withalion modified the milestones: 2026.4.0, 2026.5.0 Aug 25, 2026

Merge branch 'master' into bugfix/better-jump-to

fcce50f

Withalion removed this from the 2026.5.0 milestone Aug 27, 2026

uclaros added 2 commits August 27, 2026 18:51

review changes

826bfcf

const InputMapSettings, add safeguard

c88015e

	signal featureIdentified( var pair, var point )
	signal featureIdentified( FeatureLayerPair pair, qgsPoint clickedPoint )

Uh oh!

Conversation

uclaros commented Jul 10, 2026 • edited by Withalion Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Plan A

Plan B

Uh oh!

Withalion commented Jul 15, 2026

Uh oh!

Withalion left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Withalion Aug 17, 2026

Choose a reason for hiding this comment

Uh oh!

uclaros Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Withalion Aug 17, 2026

Choose a reason for hiding this comment

Uh oh!

uclaros Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

Withalion Aug 17, 2026

Choose a reason for hiding this comment

Uh oh!

uclaros Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Withalion commented Aug 27, 2026

Uh oh!

github-actions Bot commented Aug 27, 2026

📦 Build Artifacts Ready

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

uclaros commented Jul 10, 2026 •

edited by Withalion

Loading